Only count visible children during size request

This was causing spacing between image and label to be requested
in buttons, even though the image is invisible.

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 1ff75ebb335aa9b40f0b3c532894de48197e066a..f508173430a689dcd236ffe0c5b18c603bbe7a58 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -1164,7 +1164,7 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
   gint           largest_child = 0, largest_natural = 0;
 
   for (children = private->children; children != NULL;
-       children = children->next, nvis_children++)
+       children = children->next)
     {
       GtkBoxChild *child = children->data;
 
@@ -1190,6 +1190,8 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
 
          required_size    += child_size;
          required_natural += child_natural;
+
+          nvis_children += 1;
         }
     }